Merge tag 'upstream/2016.15' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 13 Dec 2016 13:00:33 +0000 (13:00 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 13 Dec 2016 13:00:33 +0000 (13:00 +0000)
commitb76f46c53abe89624ad28a9d76d38024abf36dec
tree06f660763f3cfce10f3f1ba31fd991b196daff2d
parent2a66110162e854b0dbe922ba25d5e1f2cb309b27
parent0ee312bf3ed7c3359a9bc9684ecab49ef8376543
Merge tag 'upstream/2016.15' into debian/master

Upstream version 2016.15